Merge commit 'remotes/origin/upstream-cvs' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Fri, 24 Jul 2009 20:55:00 +0000 (22:55 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Fri, 24 Jul 2009 20:55:00 +0000 (22:55 +0200)
commit16cc2f1c4d582c846ce5ce768a1645ba0568abca
treeb3b417952928946a4d6ea49a08b93314a191c5a5
parent2235f4d6bd38ddff78a986d8461edaaac7e02d1d
parent5a5becbf2b62942f19b822dbb3ce7470447f3acc
Merge commit 'remotes/origin/upstream-cvs' into upstream